fixing bugs and styling