big moving around to fix some displayissues. might now work