Compleation of layout fixes