styling and fixing bugs