Refactored to simpler app
refactored styling