some code updates and static design updates
some code updates and static design updates