moved around things and made it more angular