ui layout changes
server side functionality changes
cleanup