Styling

not finished, likely to be changed