finish revamping layout, add some polish