Fixes on themes layout