Fixed layout, refactored.