Some improvement in Server side and new presentation.