Improved gallery design