fixes
bug + layout fixes