Removed redundant code and added drop-shadow