Updated functions and interface layout