Add helper methods and layout