Added some frontend content
and adjusted service a bit to fit new frontend needs