Slight working & layout modification