Removed most if not all hardcoded width and height values