design fixes and session timeout