Polished with better styling. Fixed several bugs