updated to latest look + usability