Improved code formatting on default layout
Added serveral prefix helper classes