Feature/improved view

No hardcoded styles.