Layout updates and cleaning up code CJH