Add stylesheet for merging with master
Add layout for merging with master