Resolved edit issue, added few more migrations and improved styling