move videos to right and light refactoring
fix merge conflicts
change selected item styling