Some clean up
Basic styling done
Basic styling done
Merge basic_styling