Bugs and Styling fixes