fix layout issues, improve styling a bit