Fixing design issue on MAC