bugfix & layout & shit pt2