Removed tables and changed lay-out