Changed some layout, updated types and positioning