Added theme, worked on master layout