Removed uneeded declarations, added box-sizing