Finally the beta top is complete AND fixed, now working on bottom!