EmirH: fixed small bugs and formatted layout slightly