Update

Moved some components around to accommodate case design