Fixed many others layouts
Various fixes