Changed Layout and other small fixes