Select new media pictures automatically (#13)

+ Fix code style
+ Clean up

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>