commit of working version using correct css and angular via mattias