Default tab for layout now works. Also removed cruft.