initial markup commit
updated sorting / filtereing