Removed comments from base layout
Tweaked public layout