changed UI, fixed something + new bugs