total new layout still needs a lot of work