fixed rendering, need to make pretty