Layout bug fixxed