updated layout & themes