temp clean commit
slider and base reformatting
Merge pull request #5 from meismaku/mark

slider and base reformat
fixing confict
styles for filters