C1 abdelrahman wishlist

@BeshoSmile 
@Reem-Sharkawy 
@Tharwat7 

Please review