bug + layout fixes