some basic styling
fixing merge