Code Formatting and TODO fixes

Formatted the code, specially the layout files and removed the empty
TODO function declarations.