Removed some logic
Added layout