Update theme and added new alternative layout