Working on fixing baffle's upper position

Working on fixing baffle's upper position