re-worked options a little and added option to match media-queries