Bug fix and styling