Removed borders

Removed a bunch of borders to create a flat design.