Themes layouts and others fixes