Added TODOs for styling