improve layout & add party drop down