bugfix & layout & shit