Custom controls and more fixes