Spaceshipping this branch more. Revising layout new address new changes