some flexible addition and added some css