Fixed bugs, improved media list