fixed dodgy border
cleaned up