Fixed many bugs and edited some UI details