fix highlighted and start implement gallery