Improved Katie Flynn's layout