Updated Layout
updated task management and database