Feature #43, refactored layouts and styles