Code

Applied planned layout modifications