BUG FIXES AND LAYOUT SLIGHTELY CORRECT