Got presentation layer to work properly