fixed box shadows, standardized shadows & border radius throughout
removal of placeholder
merging
adding conflicts