Removed hard coded width, height values