Changed to Derrick's layout and removed styles
Commented out some code to debug a crash