chagned base layout