added ui changes and routing issues