Fix for media library layout issues. Closes #17, #18, #19
Maintenance commit