add devesh and restructure layout slightly