Various bug and layout fixes