fixed resources, refactored views, created layout, fixed views