Fixed all bugs with frame build