refactored MarinaUI