tons of Needs layout and styling changes