Fixing little bugs and styling issues