Bug fixes, styling